diff --git a/system/core/Output.php b/system/core/Output.php
index ac41294..e25e621 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -34,10 +34,13 @@
 	var $enable_profiler 	= FALSE;
 	var $parse_exec_vars	= TRUE;	// whether or not to parse variables like {elapsed_time} and {memory_usage}
 
+	var $_zlib_oc			= FALSE;
 	var $_profiler_sections = array();
 
 	function CI_Output()
 	{
+		$this->_zlib_oc = @ini_get('zlib.output_compression');
+		
 		log_message('debug', "Output Class Initialized");
 	}
 	
@@ -111,6 +114,16 @@
 	 */	
 	function set_header($header, $replace = TRUE)
 	{
+		// If zlib.output_compression is enabled it will compress the output,
+		// but it will not modify the content-length header to compensate for
+		// the reduction, causing the browser to hang waiting for more data.
+		// We'll just skip content-length in those cases.
+		
+		if ($this->_zlib_oc && strncasecmp($header, 'content-length', 14) == 0)
+		{
+			return;
+		}
+	    
 		$this->headers[] = array($header, $replace);
 	}
 
@@ -234,7 +247,7 @@
 		// --------------------------------------------------------------------
 		
 		// Is compression requested?
-		if ($CFG->item('compress_output') === TRUE)
+		if ($CFG->item('compress_output') === TRUE && $this->_zlib_oc == FALSE)
 		{
 			if (extension_loaded('zlib'))
 			{
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 21c35d6..14d173a 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -128,6 +128,7 @@
 			<li><kbd>get_mime_by_extension()</kbd> is now case insensitive.</li>
 			<li>Added "default" to the list <a href="general/reserved_names.html">Reserved Names</a>.</li>
 			<li>Added 'application/x-msdownload' for .exe files and ''application/x-gzip-compressed' for .tgz files to config/mimes.php.</li>
+			<li>Updated the output library to no longer compress output or send content-length headers if the server runs with zlib.output_compression enabled.</li>
 			<li>Eliminated a call to is_really_writable() on each request unless it is really needed (Output caching)</li>
 			<li>Documented <kbd>append_output()</kbd> in the <a href="libraries/output.html">Output Class</a>.</li>
 			<li>Documented a second argument in the <kbd>decode()</kbd> function for the <a href="libraries/encryption.html">Encryption Class</a>.</li>